<<<<<<< HEAD
=======
package hotfixtest;

public class test {
    public void  hot(){
        System.out.println("bugfix");
    }
}
>>>>>>> origin/master
